diff --git a/src/libs/cplusplus/SimpleLexer.cpp b/src/libs/cplusplus/SimpleLexer.cpp
index 59475bc4a4e78929fed5c0a4b2ec8eea602119f8..2934804f0932d8c650ebc97ae3f1c2a61983b4bd 100644
--- a/src/libs/cplusplus/SimpleLexer.cpp
+++ b/src/libs/cplusplus/SimpleLexer.cpp
@@ -63,7 +63,8 @@ bool SimpleToken::isKeyword() const
 
 bool SimpleToken::isComment() const
 {
-    return _kind == T_COMMENT || _kind == T_DOXY_COMMENT;
+    return _kind == T_COMMENT || _kind == T_DOXY_COMMENT ||
+            _kind == T_CPP_COMMENT || _kind == T_CPP_DOXY_COMMENT;
 }
 
 bool SimpleToken::isObjCAtKeyword() const
diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index e16c9008feddd36b0e4ce4e474aa69be9197a98f..07c892db1977f0b3dc5ba160a29b25a57553089c 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -1543,7 +1543,16 @@ bool CPPEditor::isInComment(const QTextCursor &cursor) const
     const SimpleToken tk = tokenUnderCursor(cursor);
 
     if (tk.isComment()) {
-        const int pos = cursor.selectionEnd();
+        const int pos = cursor.selectionEnd() - cursor.block().position();
+
+        if (pos == tk.end()) {
+            if (tk.is(T_CPP_COMMENT) || tk.is(T_CPP_DOXY_COMMENT))
+                return true;
+
+            const int state = cursor.block().userState() & 0xFF;
+            if (state > 0)
+                return true;
+        }
 
         if (pos < tk.end())
             return true;
diff --git a/src/plugins/cppeditor/cpphighlighter.cpp b/src/plugins/cppeditor/cpphighlighter.cpp
index ed5d82d2796c960400be35cb75197864e5a65f0c..1e1a200b8c82d4841982b9e389b65420cb75ea48 100644
--- a/src/plugins/cppeditor/cpphighlighter.cpp
+++ b/src/plugins/cppeditor/cpphighlighter.cpp
@@ -138,7 +138,7 @@ void CppHighlighter::highlightBlock(const QString &text)
 
         else if (tk.isComment()) {
 
-            if (tk.is(T_COMMENT))
+            if (tk.is(T_COMMENT) || tk.is(T_CPP_COMMENT))
                 setFormat(tk.position(), tk.length(), m_formats[CppCommentFormat]);
 
             else // a doxygen comment
diff --git a/src/plugins/projectexplorer/projectexplorer.pro b/src/plugins/projectexplorer/projectexplorer.pro
index 28b3cefeeacb29c81dceaeaddec9e400a0d4bcea..47204dad2807f8ff890f5d9fee92372d3521446e 100644
--- a/src/plugins/projectexplorer/projectexplorer.pro
+++ b/src/plugins/projectexplorer/projectexplorer.pro
@@ -141,7 +141,8 @@ OTHER_FILES += ProjectExplorer.pluginspec
 
 mac:LIBS += -framework Carbon
 
-SUPPORT_QT_S60 = $$(QTCREATOR_WITH_S60)
+win32:SUPPORT_QT_S60=1
+else:SUPPORT_QT_S60 = $$(QTCREATOR_WITH_S60)
 !isEmpty(SUPPORT_QT_S60) {
     message("Adding experimental support for Qt/S60 applications.")
     DEFINES += QTCREATOR_WITH_S60
diff --git a/src/shared/cplusplus/Lexer.cpp b/src/shared/cplusplus/Lexer.cpp
index a9ef6cce3ff67d37e590de5f9e86914060b3d341..79c9bf4af1c0aebfe0abc15889f6f3a4e8c5e623 100644
--- a/src/shared/cplusplus/Lexer.cpp
+++ b/src/shared/cplusplus/Lexer.cpp
@@ -428,7 +428,7 @@ void Lexer::scan_helper(Token *tok)
             if (! f._scanCommentTokens)
                 goto _Lagain;
 
-            tok->f.kind = doxy ? T_DOXY_COMMENT : T_COMMENT;
+            tok->f.kind = doxy ? T_CPP_DOXY_COMMENT : T_CPP_COMMENT;
 
         } else if (_yychar == '*') {
             yyinp();
diff --git a/src/shared/cplusplus/Token.cpp b/src/shared/cplusplus/Token.cpp
index 14a62f3db3aeac2b72c46078e5f8c9224a8dd6e8..547849b1ccb7adfcd42b8d135949f84aa472ec85 100644
--- a/src/shared/cplusplus/Token.cpp
+++ b/src/shared/cplusplus/Token.cpp
@@ -54,6 +54,7 @@ CPLUSPLUS_BEGIN_NAMESPACE
 static const char *token_names[] = {
     (""), ("<error>"),
 
+    ("<C++ comment>"), ("<C++ doxy comment>"),
     ("<comment>"), ("<doxy comment>"),
 
     ("<identifier>"), ("<numeric literal>"), ("<char literal>"),
diff --git a/src/shared/cplusplus/Token.h b/src/shared/cplusplus/Token.h
index 861c21da27b78d887b5d5b146ca313758e3dc527..00d42b7f89c9927c93b04714c75a0a91177f54e1 100644
--- a/src/shared/cplusplus/Token.h
+++ b/src/shared/cplusplus/Token.h
@@ -59,6 +59,8 @@ enum Kind {
     T_EOF_SYMBOL = 0,
     T_ERROR,
 
+    T_CPP_COMMENT,
+    T_CPP_DOXY_COMMENT,
     T_COMMENT,
     T_DOXY_COMMENT,
     T_IDENTIFIER,
@@ -297,7 +299,8 @@ public:
     { return f.kind >= T_FIRST_KEYWORD && f.kind < T_FIRST_QT_KEYWORD; }
 
     inline bool isComment() const
-    { return f.kind == T_COMMENT || f.kind == T_DOXY_COMMENT; }
+    { return f.kind == T_COMMENT || f.kind == T_DOXY_COMMENT ||
+      f.kind == T_CPP_COMMENT || f.kind == T_CPP_DOXY_COMMENT; }
 
     inline bool isObjCAtKeyword() const
     { return f.kind >= T_FIRST_OBJC_AT_KEYWORD && f.kind <= T_LAST_OBJC_AT_KEYWORD; }