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

Merge remote-tracking branch 'origin/2.6'

Browse Source 
Conflicts:
	src/libs/utils/fileutils.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/genericdirectuploadservice.cpp
	src/tools/qtcreatorcrashhandler/main.cpp

Change-Id: I830287691e7085fe9c94597e23ec7be64eb8be42
This commit is contained in:
Eike Ziller
2012-10-09 11:50:17 +02:00
parent 8ec446efdc 2b56943a8e
commit d5d1c5e394
76 changed files with 538 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/help/help.pro
View File

@@ -4,9 +4,11 @@ TARGET = Help
QT += network
greaterThan(QT_MAJOR_VERSION, 4) {
QT += printsupport help
DEFINES += QT_NO_WEBKIT
!isEmpty(QT.webkit.name): QT += webkit
else: DEFINES += QT_NO_WEBKIT
} else {
CONFIG += help
CONFIG += help
contains(QT_CONFIG, webkit): QT += webkit
}
INCLUDEPATH += $$PWD
@@ -68,7 +70,3 @@ FORMS += docsettingspage.ui \
RESOURCES += help.qrc
include(../../shared/help/help.pri)
contains(QT_CONFIG, webkit) {
QT += webkit
}