Merge remote-tracking branch 'origin/11.0'

Change-Id: I87b22a73427cf9fc1b96075dc0db769ed3d3621c

1 files changed, 2 insertions, 1 deletions

diff --git a/src/plugins/debugger/breakpoint.h b/src/plugins/debugger/breakpoint.h
index b5ea0628da7..af96f43d055 100644
--- a/src/plugins/debugger/breakpoint.h
+++ b/src/plugins/debugger/breakpoint.h
@@ -7,6 +7,7 @@
 #include <QString>
 
 #include <utils/filepath.h>
+#include <utils/textutils.h>
 
 namespace Debugger {
 namespace Internal {
@@ -139,7 +140,7 @@ public:
     Utils::FilePath fileName;//!< Short name of source file.
     QString condition;       //!< Condition associated with breakpoint.
     int ignoreCount;         //!< Ignore count associated with breakpoint.
-    int lineNumber;          //!< Line in source file.
+    Utils::Text::Position textPosition;     //!< Line and column in source file.
     quint64 address;         //!< Address for address based data breakpoints.
     QString expression;      //!< Expression for expression based data breakpoints.
     uint size;               //!< Size of watched area for data breakpoints.