feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.0'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/debugger/debuggerruncontrol.cpp

Change-Id: I81b43480a1369e3d7be60ae26e812dda6b962b0b
This commit is contained in:
Oswald Buddenhagen
2016-04-01 17:31:39 +02:00
parent 26e51ff633 ea1f5d2b6c
commit e426d08e54
143 changed files with 6586 additions and 2764 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/help/qtwebkithelpviewer.h
View File

@@ -35,7 +35,7 @@
namespace Help {
namespace Internal {
class HelpPage;
class QtWebKitHelpPage;
class QtWebKitHelpWidget;
class QtWebKitHelpViewer : public HelpViewer
@@ -69,7 +69,7 @@ public:
bool findText(const QString &text, Core::FindFlags flags,
bool incremental, bool fromSearch, bool *wrapped = 0);
HelpPage *page() const;
QtWebKitHelpPage *page() const;
public slots:
void scaleUp();
@@ -127,11 +127,11 @@ private:
QtWebKitHelpViewer *m_parent;
};
class HelpPage : public QWebPage
class QtWebKitHelpPage : public QWebPage
{
Q_OBJECT
public:
HelpPage(QObject *parent);
QtWebKitHelpPage(QObject *parent);
protected:
virtual QWebPage *createWindow(QWebPage::WebWindowType);