feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
38,329 Commits 108 Branches 368 Tags
fd8fcd29a1d70a10864fc5a6e5c6dc5cf1c96ecf
Commit Graph

68 Commits

Author SHA1 Message Date
Eike Ziller
8295b503be License update 
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-10-09 11:41:44 +02: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
hjk
8098c085fe Utils: Cleanup of Tooltip interface 
Change-Id: If4908e7a5d5ce749ff1e2efc7a026604821737be
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-09-13 11:35:22 +02:00
Daniel Teske
916ae49b6a FancyToolButton: remove forceVisible 
It's never used

Change-Id: Ia2e7ab19685066daf29b5209cb7ea2a7485dfcf2
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-06-20 13:17:50 +02:00
Daniel Teske
198d125a1c FancyToolButton::paintEvent remmove unused variables 
Change-Id: I5eb7fa9d1efc06292ee22e9db195204e37f3aa4b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-06-20 11:30:38 +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
Christian Kandeler
17765de169 Core: Remove unneeded ifdefs. 
Replace compile-time checks for host OS by run-time checks.

Change-Id: I9f237389171586786c2609f81314bcb1bc17b01e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-03-15 10:00:08 +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
Daniel Teske
1a1b8abd3e MiniTargetSelector: If the project's displayname is non unique show path 
Task-number: QTCREATORBUG-8329
Change-Id: Ia256c09a634ff4794b67007e5013680a8a740201
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-01-11 15:06:10 +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
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
Daniel Teske
8591b89807 Ensure consistent size of facnyactionbar button 
Otherwise the button can jump on switching projects.

Change-Id: I2b6d0a5afe5fc54933fe31d381a312cce896361e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-01-31 11:59:28 +01:00
Denis Mingulov
a36d587ccf Fix non-needed usage of QString's fromLocal8Bit() and fromUtf8() 
QString::fromLocal8Bit() and QString::fromUtf8() are much more slower
than an obvious QString::fromLatin1() and QLatin1String(), so this
commit changes some places where these functions are really not
needed.

QString::fromLatin1() is used in case if QString object is used
immediately (something like QString::fromLatin1().arg()),
QLatin1String is used otherwise like in other places (for example,
QPixmap(QLatin1String("..."))) - to allow to use default QString
constructor and work with QT_NO_CAST_FROM_ASCII.

Change-Id: Ib6eb1c61e9cb35c7c5b7569fea77c5e41d32621a
Reviewed-by: hjk <qthjk@ovi.com>
 2012-01-30 17:50:45 +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
Morten Johan Sorvig
b0cd54c1ec Replace Q_WS_MAC with Q_OS_MAC. 
We want to carry over all mac-specific code paths
to Qt 5. WS_MAC is no longer set; OS_MAC is.

This change is compatible with Qt 4 builds since
OS_MAC is set whenever WS_MAC is. (OS_MAC would
also be set for the theoretical X11/Mac platform,
but that's anyway not a supported configuration
for Creator)

Change-Id: Ib25d8c4e83e7e27d911124cd48aa17fdb875923f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-01-26 11:06:12 +01:00
Eike Ziller
ead4674646 Make build configuration on target selector a two line label 
Change-Id: I9d8a21fbedf07e81f17cbb21405c2b6e7f0c161c
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-15 18:25:05 +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
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
b1bcf081d8 Merge branch '2.1' 
Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp
 2010-12-17 17:00:53 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
Friedemann Kleint
6063fb84c2 Fix exported headers in Core and TextEditor. 
- Unexport Core::Internal::MainWindow and remove its includes.
- Move RssFetcher from Core::Internal to Core.
- Unexport CopyTaskHandler.
- Move TextEditor's completion support and Refactor Overlay
  helper classes from TextEditor::Internal to TextEditor as they
  are exported.
- Move internal BaseTextBlockSelection into private header.
- Unexport TextEditorOverlay as they are not used.
 2010-11-01 16:29:45 +01:00
Jens Bache-Wiig
2b742e2528 Fix some layout issues with the sidebar 
* Minimum width now depends on translated strings
* Missing margin for target name added

Task-number: QTCREATORBUG-468
 2010-04-14 18:01:22 +02:00
dt
5f2ae2af47 Less includes 2010-04-07 13:51:07 +02:00
Jens Bache-Wiig
97901302b3 Fix resizing of actionbar 
We no longer allow it to collapse below it's size hint.
I also reduced the bottom margin.
 2010-03-31 18:52:11 +02:00
mae
ed74fdd5ce Have your debug button back 2010-03-30 12:27:57 +02:00
Jens Bache-Wiig
74928d0199 Make disabled icons sharper in sidebar 
This overrides the styles default behavior for disabled
icons and simply generates their grayscale equivalent so
they look a bit crisper.
 2010-03-23 16:57:41 +01:00
Jens Bache-Wiig
f014f3a424 Improve icon and label behavior for target selector 
I modified the text margins, removed the inconsistent
"No project" label and made sure we fall back to
the default computer icon when no project is open.
 2010-03-19 18:41:21 +01:00
mae
f4add2b852 On Mac, toggle run/debug with the open button (Qt::Key_Alt) 2010-03-18 14:08:45 +01:00
Jens Bache-Wiig
40aa17a2e2 Replace reflection by generated drop shadows in sidebar 
The sidebar is a diffuse surface. Hence the reflection
does not really make sense there. Additionally, this
allows us to get more unified spacing and we can apply
the same shadow to system icons.
 2010-03-15 17:11:12 +01:00
Jens Bache-Wiig
47d6195c72 Fix size and height of the sidebar project selector icon 
This makes the positioning of text and icon adjust if the
text labels are empty.
 2010-03-12 18:47:41 +01:00
mae
d13dfe44f0 Some tuning of the fancy action bar 
Done-with: jbache
 2010-03-12 17:25:02 +01:00
mae
c6d79d0457 Do not rely on Qt's smartness for flicker avoidance 2010-03-12 14:31:42 +01:00
mae
d61a7f59b2 Make the run and debug buttons in the FancyActionBar mutual exclusive 
Debug is now only available in debug mode, run is available in all
other modes.
 2010-03-12 14:23:17 +01:00
Jens Bache-Wiig
8575e4c784 Make action icons bigger 
As suggested by Nigel and others, we should
use the same icon size for all the icons.
 2010-03-11 18:32:58 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Jens Bache-Wiig
7bd076e4f0 Improve sidebar readability on mac 
Slightly increased the font size. Added a bit
more shadow and tweaked the progress bar.
 2010-02-26 16:12:59 +01:00
Jens Bache-Wiig
b7650d343e Fix an icon centering problem on the actionbar 
The actualPixmapSize is different
from the resulting pixmap when using
svg icons. This seems to be a bug
in Qt, but using the resulting pixmap
is safe for now.
 2010-02-24 19:56:33 +01:00
Jens Bache-Wiig
7af1e21144 Improved styling of project target selector 2010-02-24 19:25:44 +01:00
Jens Bache-Wiig
f331f3322b Mor polish for the sidebar 2010-02-22 14:38:18 +01:00
Jens Bache-Wiig
1ea114b414 Make the panel action sunken when panel is open 2010-02-22 14:36:45 +01:00
Jens Bache-Wiig
0dccaf45a2 Updated hover and pressed appearance for sidebar 2010-02-22 14:36:45 +01:00
Jens Bache-Wiig
54b2ab7190 Color tweaks 2010-02-22 14:36:45 +01:00
Jens Bache-Wiig
7899a2733b Animate sidebar tabs independently 2010-02-22 14:36:45 +01:00
Jens Bache-Wiig
915923a17c Clean up sidebar tabs 
Killed the divider lines for improved aestetics
Made the hover a bit more subtle
 2010-02-22 14:36:45 +01:00