diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-17 18:25:39 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-17 18:25:39 +0100 |
| commit | 6863ce4e3582745ad683df646746fe23a8e21592 (patch) | |
| tree | 8bae39f23dddd59a80d9942a45d60ccf414f7810 /src/pixeltool | |
| parent | b18f31c9aebd273fd58646dc484d44b91662fa7a (diff) | |
| parent | 9b0b4e799aadde36521acff0dc3439b4eae51877 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
sync.profile
Change-Id: I9871b004cc76d14d34f4a904cd7a8e4f8e2bb91a
Diffstat (limited to 'src/pixeltool')
| -rw-r--r-- | src/pixeltool/main.cpp | 2 | ||||
| -rw-r--r-- | src/pixeltool/pixeltool.pro | 1 | ||||
| -rw-r--r-- | src/pixeltool/qpixeltool.cpp | 2 | ||||
| -rw-r--r-- | src/pixeltool/qpixeltool.h | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/src/pixeltool/main.cpp b/src/pixeltool/main.cpp index 2dd93a847..50771c236 100644 --- a/src/pixeltool/main.cpp +++ b/src/pixeltool/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the tools applications of the Qt Toolkit. diff --git a/src/pixeltool/pixeltool.pro b/src/pixeltool/pixeltool.pro index 2f0d4d7c1..d6dc6a2a2 100644 --- a/src/pixeltool/pixeltool.pro +++ b/src/pixeltool/pixeltool.pro @@ -1,4 +1,3 @@ -CONFIG += qt warn_on !build_pass:contains(QT_CONFIG, build_all): CONFIG += release QT += widgets network diff --git a/src/pixeltool/qpixeltool.cpp b/src/pixeltool/qpixeltool.cpp index ddac9101c..0c44dbf52 100644 --- a/src/pixeltool/qpixeltool.cpp +++ b/src/pixeltool/qpixeltool.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the tools applications of the Qt Toolkit. diff --git a/src/pixeltool/qpixeltool.h b/src/pixeltool/qpixeltool.h index 7da63b3b6..f7c2805fa 100644 --- a/src/pixeltool/qpixeltool.h +++ b/src/pixeltool/qpixeltool.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the tools applications of the Qt Toolkit. |