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>
If Webkit is disabled, moc will run on the file anyway, because there is
a ".moc" included and moc does not know about #ifdefs. This results in
an ugly warning ("no output generated") being emitted in the no-Webkit
case.
Solve the problem by moving the declaration of the QObject subclass into
the header file.
Change-Id: I2abaffd85a342fa2f3dbaa7bcf3ef63a2972c73e
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
They are deprecated in Qt 5. Call std::memset and std::memcpy instead.
Change-Id: I53c22283208b4d6fdfcba870c3b141f3c02001bd
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
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>
qVariantvalue() is deprecated in Qt 5. qvariant_cast() does
the same thing and works in Qt 4 and Qt 5.
Change-Id: I922329d3a47fe394669f5d97a25f0825d3d2dea5
Reviewed-by: hjk <qthjk@ovi.com>
Deregistering the old documentation must be delayed till the help engine
is set up, because otherwise the list of registered namespaces is empty.
Task-number: QTCREATORBUG-4605
Change-Id: I08288129fe24a80b7af090c3aa5dd13395bc6093
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
I.e. define WITH_TESTS for debug builds or if the respective
environment variable is set.
Change-Id: I2764ece50d0783e8cb030b1695e6f59cf6063248
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
The class' member functions are intended to be used
instead of the Q_OS_* macros in all contexts where
the latter are not syntactically required.
This lowers the likelihood of changes made on one
platform breaking the build on another, e.g. due to
the code model missing symbols in #ifdef'ed out code
when refactoring.
Change-Id: I4a54788591b4c8f8d589b8368a6c683d4155c9fa
Reviewed-by: hjk <qthjk@ovi.com>
Also removed all <QMainWindow> includes which are not needed
anymore.
Change-Id: I393c9a62a5c6df95d9f35d872e1473a4f13bcdc4
Reviewed-by: hjk <qthjk@ovi.com>
Running the external window will take down the central widget as
well, cause calling m_externalWindow->setCentralWidget(m_centralWidget)
will pass ownership to the window. Calling delete on the central
widget inside the plugin constructor will crash, so set it to NULL.
Change-Id: I88ddde68a1ca3a47182de7c19847808738431149
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
This is true for html files that are styled thru style sheets.
We could implement a workaround using jQuery and manipulate
the html/ css, but this is so slow that I won't do that.
Instead add a note and tell the user about the underlying problem.
Task-number: QTCREATORBUG-4871
Change-Id: Id3d0a490bb160825ec643f8c84871aad6cf1b796
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
Used the wrong call to do this, there is a similar function that
should have been used.
Task-number: QTCREATORBUG-6762
Task-number: QTCREATORBUG-7195
Change-Id: Ic2317eda1c8d45006641b64507d08efb48e7e5a2
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
The call will trigger a setup of the local help manager,
which is rather heavy and should be avoided if possible.
Change-Id: I03fbe6a30fba6ac48361c7e2b5aa6d45dad5126b
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
Fixes a spinning cursor in case the page was not fully
loaded and we where closing it at the same time.
Change-Id: Iae6efac70c0c8be2f84e6b1551275bbdf9c5aab3
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
