broke with the introduction of ICore::documentationPath in
60f7f00e41
Change-Id: Ic63ded85bcbe27f64ad2a9436683472cc8bf01b8
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This still stems from times where we bundled qmlviewer with Qt Creator.
Change-Id: I741ef9c098ed413b473560f5e60c8d35415f8d7c
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
A few details are still to be done:
- extra windows are not restored yet
- window title of extra windows should show information about current
editor
- the "raise main window" hack for Linux doesn't work with Qt 5
But it should already now be quite usable.
Change-Id: I638583ee4b2abe32e95c261bdf31b4a10b472748
Reviewed-by: David Schulz <david.schulz@digia.com>
the information is redundant now
Change-Id: Icc8c8b4ace11538d45c6c9e1dbe5a7976f4743e1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
instead of directly including the respective pri files in
*_dependencies.pri, set variables and let qtcreator.pri resolve
them to includes.
this will allow us to re-use the dependency info elsewhere.
Change-Id: Iaa33924e428ac0409660f42df2f98a7978452d3e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
A property set on the product level is ignored if the same property
is also set in a Properties block whose condition matches.
Change-Id: I9248d735977e3d8ff8f1836fd80a49f3c8839bdc
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Replace compile-time check for Host OS with runtime check.
Change-Id: I149dc6dd8539e6598c84ae223df3cb76cc8ca675
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
- Expand the 'home page' field in help dialog: it used to be quite small, with some space
left on the same line.
- Align labels them with the middle of the combo (center vertically).
Change-Id: Ife1f73e25d7c1aa7ca7e82782c6858e19caad4a9
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Use data members instead of virtual functions for id, displayName and
priority, use Core::Id, not QStrings for id, de-pimpl CommandLocator.
Change-Id: Id8b41f184cb995138b2d76c923d6d3ae02b7e3f5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
Global constants that are used only in one place could live
just there.
Change-Id: Ibee751b6ccc4fb0d35a8e708995730991becd749
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
#!/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>
Resources addressed as urls in offline css files were not loaded
(e.g. breadcrumb icons) due to the base url not being setup and
therefore defaulting to the main page, when it should have been
set to the url of the corresponding style sheet to make relative
urls work correctly.
This also eliminates the need for the workaround introduced earlier.
Task-number: QTCREATORBUG-8211
Change-Id: Icf365781544255e322259262ea6a19a0b1dc7a25
modified: src/plugins/help/helpviewer_qwv.cpp
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
(cherry picked from commit b5bfb81508)
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Compilation on mac with latest qt5 fails with
fatal error: 'QWebSettings' file not found
The compiler call adds "include/QtWebKitWidgets" to include path,
not "include/QtWebKit" . This might be a qmake related issue on mac.
Attempt to fix it by adding an explicit webkit dependency.
Change-Id: I032dd4dda7371a8d477f8544b0ba0004856f3d76
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Resources addressed as urls in offline css files were not loaded
(e.g. breadcrumb icons) due to the base url not being setup and
therefore defaulting to the main page, when it should have been
set to the url of the corresponding style sheet to make relative
urls work correctly.
This also eliminates the need for the workaround introduced earlier.
Task-number: QTCREATORBUG-8211
Change-Id: Icf365781544255e322259262ea6a19a0b1dc7a25
modified: src/plugins/help/helpviewer_qwv.cpp
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
The help plugin uses the widgets API of QtWebKit and therefore needs
QtWebKitWidgets
Change-Id: I49b8530e3f44b42c48979c33d0b6b1fdb20c374b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Now the formatting in the help viewer looks as usual again.
Webkit was disabled to make creator compile with Qt5 in the Nov 2011
days.
Change-Id: Ic926cc94bda4a4953360f2daee414ba17aa4037b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Avoid using "." as includePath when it is unneeded
Change-Id: I9bc6f4ebe50409f49782520033fd5f098aed10d0
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
