summaryrefslogtreecommitdiffstats
path: root/src/doppelganger
diff options
context:
space:
mode:
authoraavit <eirik.aavitsland@digia.com>2014-11-14 15:01:55 +0100
committeraavit <eirik.aavitsland@digia.com>2014-11-14 15:25:43 +0100
commit7c5126a80c95f262ff3c480604b57532d9ed9079 (patch)
tree053fba4f2f3ccd2b231b310ab49b9db39491d095 /src/doppelganger
parent1f0de42b9d5a8ef665e6799019eed898b0396586 (diff)
parent9b2dd9f64bdd5c2349407ae8517ae974eda97885 (diff)
Merge remote-tracking branch 'origin/stable' into dev
Diffstat (limited to 'src/doppelganger')
-rw-r--r--src/doppelganger/main.cpp4
-rw-r--r--src/doppelganger/permissioncontroller.cpp4
-rw-r--r--src/doppelganger/permissioncontroller.h4
-rw-r--r--src/doppelganger/powermanager.cpp4
-rw-r--r--src/doppelganger/powermanager.h4
-rw-r--r--src/doppelganger/schedulingpolicyservice.cpp4
-rw-r--r--src/doppelganger/schedulingpolicyservice.h4
7 files changed, 14 insertions, 14 deletions
diff --git a/src/doppelganger/main.cpp b/src/doppelganger/main.cpp
index 0fe5338..3e86a66 100644
--- a/src/doppelganger/main.cpp
+++ b/src/doppelganger/main.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2014 Digia Plc
** All rights reserved.
** For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
**
** This file is part of Qt Enterprise Embedded.
**
@@ -13,7 +13,7 @@
** a written agreement between you and Digia.
**
** If you have questions regarding the use of this file, please use
-** the contact form at http://qt.digia.com/
+** the contact form at http://www.qt.io
**
****************************************************************************/
#include <binder/IPCThreadState.h>
diff --git a/src/doppelganger/permissioncontroller.cpp b/src/doppelganger/permissioncontroller.cpp
index a759dd7..9538b1a 100644
--- a/src/doppelganger/permissioncontroller.cpp
+++ b/src/doppelganger/permissioncontroller.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2014 Digia Plc
** All rights reserved.
** For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
**
** This file is part of Qt Enterprise Embedded.
**
@@ -13,7 +13,7 @@
** a written agreement between you and Digia.
**
** If you have questions regarding the use of this file, please use
-** the contact form at http://qt.digia.com/
+** the contact form at http://www.qt.io
**
****************************************************************************/
#include "permissioncontroller.h"
diff --git a/src/doppelganger/permissioncontroller.h b/src/doppelganger/permissioncontroller.h
index 7feb4b6..211a346 100644
--- a/src/doppelganger/permissioncontroller.h
+++ b/src/doppelganger/permissioncontroller.h
@@ -3,7 +3,7 @@
** Copyright (C) 2014 Digia Plc
** All rights reserved.
** For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
**
** This file is part of Qt Enterprise Embedded.
**
@@ -13,7 +13,7 @@
** a written agreement between you and Digia.
**
** If you have questions regarding the use of this file, please use
-** the contact form at http://qt.digia.com/
+** the contact form at http://www.qt.io
**
****************************************************************************/
#ifndef PERMISSIONCONTROLLER_H
diff --git a/src/doppelganger/powermanager.cpp b/src/doppelganger/powermanager.cpp
index 47ab02f..7f0da97 100644
--- a/src/doppelganger/powermanager.cpp
+++ b/src/doppelganger/powermanager.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2014 Digia Plc
** All rights reserved.
** For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
**
** This file is part of Qt Enterprise Embedded.
**
@@ -13,7 +13,7 @@
** a written agreement between you and Digia.
**
** If you have questions regarding the use of this file, please use
-** the contact form at http://qt.digia.com/
+** the contact form at http://www.qt.io
**
****************************************************************************/
diff --git a/src/doppelganger/powermanager.h b/src/doppelganger/powermanager.h
index f934b31..23f2695 100644
--- a/src/doppelganger/powermanager.h
+++ b/src/doppelganger/powermanager.h
@@ -3,7 +3,7 @@
** Copyright (C) 2014 Digia Plc
** All rights reserved.
** For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
**
** This file is part of Qt Enterprise Embedded.
**
@@ -13,7 +13,7 @@
** a written agreement between you and Digia.
**
** If you have questions regarding the use of this file, please use
-** the contact form at http://qt.digia.com/
+** the contact form at http://www.qt.io
**
****************************************************************************/
diff --git a/src/doppelganger/schedulingpolicyservice.cpp b/src/doppelganger/schedulingpolicyservice.cpp
index 365e97a..7113e6a 100644
--- a/src/doppelganger/schedulingpolicyservice.cpp
+++ b/src/doppelganger/schedulingpolicyservice.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2014 Digia Plc
** All rights reserved.
** For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
**
** This file is part of Qt Enterprise Embedded.
**
@@ -13,7 +13,7 @@
** a written agreement between you and Digia.
**
** If you have questions regarding the use of this file, please use
-** the contact form at http://qt.digia.com/
+** the contact form at http://www.qt.io
**
****************************************************************************/
#include "schedulingpolicyservice.h"
diff --git a/src/doppelganger/schedulingpolicyservice.h b/src/doppelganger/schedulingpolicyservice.h
index f544561..2dc1e42 100644
--- a/src/doppelganger/schedulingpolicyservice.h
+++ b/src/doppelganger/schedulingpolicyservice.h
@@ -3,7 +3,7 @@
** Copyright (C) 2014 Digia Plc
** All rights reserved.
** For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
**
** This file is part of Qt Enterprise Embedded.
**
@@ -13,7 +13,7 @@
** a written agreement between you and Digia.
**
** If you have questions regarding the use of this file, please use
-** the contact form at http://qt.digia.com/
+** the contact form at http://www.qt.io
**
****************************************************************************/
#ifndef SCHEDULINGPOLICYSERVICE_H