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

Fixes: - use QT_NO_WEBKIT instead of QT_WEBKIT, USE_WEBKIT

Browse Source 
Task:     - none
AutoTest: - compile test
Details:  - use QT_NO_WEBKIT instead of QT_WEBKIT, USE_WEBKIT
This commit is contained in:
Patrick Star
2008-12-02 13:38:31 +01:00
parent 03b3f5b3a7
commit 7d6f2bb45a
8 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/coreplugin/welcomemode.cpp
View File

@@ -36,7 +36,7 @@
#include "coreimpl.h"
#include "modemanager.h"
#ifdef QT_WEBKIT
#if !defined(QT_NO_WEBKIT)
#include <QtWebKit/QWebView>
#include <QtGui/QApplication>
#include <QtCore/QFileInfo>
@@ -69,7 +69,7 @@ struct WelcomeModePrivate {
WelcomeModePrivate();
QWidget *m_widget;
#ifdef QT_WEBKIT
#if !defined(QT_NO_WEBKIT)
QWebView *m_webview;
#else
QLabel *m_label;
@@ -85,7 +85,7 @@ struct WelcomeModePrivate {
WelcomeModePrivate::WelcomeModePrivate() :
m_widget(new QWidget),
#ifdef QT_WEBKIT
#if !defined(QT_NO_WEBKIT)
m_webview(new QWebView),
#else
m_label(new QLabel),
@@ -97,7 +97,7 @@ WelcomeModePrivate::WelcomeModePrivate() :
{
}
#ifndef QT_WEBKIT
#if defined(QT_NO_WEBKIT)
const char *LABEL = "<center><table><tr><td><img src=\":/qworkbench/html/images/product_logo.png\"/></td><td width=300>"
"<h2><br/><br/>Welcome</h2><p> Qt Creator is an intuitive, modern cross platform IDE that enables "
@@ -142,7 +142,7 @@ WelcomeMode::WelcomeMode() :
l->setMargin(0);
l->setSpacing(0);
l->addWidget(new QToolBar(m_d->m_widget));
#ifdef QT_WEBKIT
#if !defined(QT_NO_WEBKIT)
connect(m_d->m_webview, SIGNAL(linkClicked(QUrl)), this, SLOT(linkClicked(QUrl)));
WelcomePageData welcomePageData;
@@ -199,7 +199,7 @@ void WelcomeMode::updateWelcomePage(const WelcomePageData &welcomePageData)
{
// should really only modify the DOM tree
#ifndef QT_WEBKIT
#if defined(QT_NO_WEBKIT)
Q_UNUSED(welcomePageData);
#else