Commit 1feb5c60 authored by Eike Ziller's avatar Eike Ziller

Merge remote-tracking branch 'origin/4.4'

Change-Id: I02e54f45d233b89ddaee9c87da9b9af2a56374b8
parents 13d3a7a5 e65d4c6f
......@@ -84,8 +84,8 @@ QML Support
Debugging
* Added `Alt+V` + letter shortcuts to open views
* Added dumper for `qfloat16`
* Added dumpers for `std::{optional,byte}`, `gsl::{span,byte}`, `boost::variant`
* Added pretty printing for `qfloat16`, `std::{optional,byte}`, `gsl::{span,byte}`
and `boost::variant`
* Improved display of enum bitfields
* Fixed support for `long double` (QTCREATORBUG-18023)
* CDB
......
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:FDL$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
** Documentation License version 1.3 as published by the Free Software
** Foundation and appearing in the file included in the packaging of
** this file. Please review the following information to ensure
** the GNU Free Documentation License version 1.3 requirements
** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
** $QT_END_LICENSE$
**
****************************************************************************/
/*
This prevents autolinking of each occurrence of 'macOS'.
Explicit links will still work (\l macOS).
*/
/*!
\externalpage nolink
\title macOS
\internal
*/
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Creator documentation.
......@@ -52,7 +52,7 @@
{kit} for building and running your projects
in \uicontrol Tools > \uicontrol Options > \uicontrol {Build & Run} > \uicontrol Kits.
\section2 Setting Up New Qt Versions
\section1 Setting Up New Qt Versions
To add a Qt version:
......@@ -78,7 +78,22 @@
\endlist
\section2 Minimum Requirements
\section1 Troubleshooting Qt Installations
If \QC detects problems in the installation of a Qt version, it displays
warnings and errors beside the name of the Qt version in the list. Select
the Qt version to see more information about the issue and suggestions for
fixing it.
To determine whether a particular Qt version is installed correctly, \QC
calls \c {qmake -query} and checks that the directories referenced in the
output exist. When \QC complains about the installation of a self-built Qt
version, try running \c {make install} in the build directory to actually
install Qt into the configured location. If you installed Qt using the Qt
installer, run the Qt maintenance tool to check for updates or to reinstall
the Qt version.
\section1 Minimum Requirements
If your build of Qt is incomplete but you still want to use QMake as build
system, you need to ensure the following minimum requirements to be able to use that setup with \QC.
\list 1
......
......@@ -39,29 +39,38 @@
\title Exporting Designs from Graphics Software
You can export designs from graphics software, such as Adobe Photoshop and
GIMP, to QML files. Each scene is converted into a single QML file with an
\l [QML]{Image} or a \l [QML]{Text} item for each layer and saved on the
development PC. Top-level layer groups are converted into merged QML
\l [QML]{Image} types.
GIMP, to QML files.
\section1 Exporting from Adobe Photoshop to QML
You can use a QML Asset Exporter to export designs from Adobe Photoshop
to .ui.qml files. The the QML Asset Exporter provides templates that are
based on the \l{http://www.pngexpress.com}{PNG EXPRESS} plugin for
Photoshop. They enable you to export PSD files to QML format, so that each
PSD file is converted into an .ui.qml file.
The filename of the generated document is based on the name of the PSD file.
Tagged image and text objects are exported with absolute positioning. Text
objects are exported with font and alignment information.
For more information, see the
\l {https://github.com/Pelagicore/QmlAssetExporter}{QML Asset Exporter}
documentation.
\note GIMP does not support grouping, and therefore, each layer is exported
as an item in GIMP.
\section1 Exporting from GIMP to QML
\image qml-export-gimp.png
Each scene is converted into a single QML file with an
\l [QML]{Image} or a \l [QML]{Text} item for each layer and saved on the
development PC. Each layer is exported as an item.
You can open the QML file in \QC for editing. By default, the export scripts
generate Qt Quick 1 files. To edit the files in \QMLD, change the import
statements in the export scripts to import Qt Quick 2. Or, you can change
the import statement in each file after generating the files.
If you edit the file in Adobe
Photoshop and export it to the same directory again, any changes you made in
\QC are overwritten. However, you can re-export graphical assets without
recreating the QML code.
If you create vector graphics with other tools that have an Adobe Photoshop
export option, such as Adobe Illustrator, you can export them first to
Photoshop and then to QML.
\section1 Conversion Rules
\section2 Conversion Rules
The following rules apply to the conversions:
......@@ -85,24 +94,21 @@
\endlist
\section1 Preparing Files for Conversion
\section2 Preparing Files for Conversion
To create QML files that are easy to use, prepare the Adobe Photoshop or
To create QML files that are easy to use, prepare the
GIMP designs for exporting, as follows:
\list
\li To minimize the number of items, minimize the number of layers or
use top-level layer groups, because each layer or layer group is
\li To minimize the number of items, minimize the number of layers,
because each layer or is
exported as a \l [QML]{Text} or \l [QML]{Image} item.
\li To make sure that all related items are exported to the same
item, use top-level layer groups.
\li To determine that some layers are not exported, hide them, and
deselect the \uicontrol {Export hidden} check box during exporting.
\li To make it easier to find the layers and layer groups after
\li To make it easier to find the layers after
exporting them, use descriptive names for them.
\li To make sure that image dimensions are preserved during export,
......@@ -118,65 +124,7 @@
\endlist
\section1 Exporting from Adobe Photoshop to QML
\image qml-export-photoshop.png
The script has been tested to work on Adobe Photoshop CS 4 and 5, but it
might also work on other versions.
\list 1
\li Clone the repository that contains the export script,
\e{Export QML.jx}, from
\l{https://codereview.qt-project.org/#/admin/projects/qt-labs/photoshop-qmlexporter}
{Qt Code Review}.
\note Read the README.txt file in the repository for latest
information about the script.
\li To generate QML files that you can edit in \QMLD, edit the import
statement in \e {Export QML.jx}. For example:
\code
qmlfile.write("import QtQuick 2.5\n");
\endcode
\li Double-click the export script to add the export command to the
\uicontrol Scripts menu. You can also copy the script file to the Adobe
Photoshop scripts directory (typically, \c{\Presets\Scripts} in the
Photoshop installation directory).
\li In Adobe Photoshop, choose \uicontrol {File > Scripts > Export to QML} to
export the scene to a QML file.
\li In the \uicontrol {Export Document to QML} dialog, enter a name and
location for the QML file.
\li Select the \uicontrol {Rasterize text} check box to export text layers as
images, not as \l [QML]{Text} items.
\li Select the \uicontrol {Group layers} check box to export each top-level
group as a merged QML \l [QML]{Image} item.
\li Select the \uicontrol {Export hidden} check box to export hidden layers
and to set their visibility property to hidden.
\li Deselect the \uicontrol {Export QML} check box if you have modified the
QML document in \QC, but still want to re-export graphical assets.
\li Click \uicontrol Export.
\endlist
The QML file is saved to the location that you specified. In \QC, choose
\uicontrol {File > Open File or Project} to open the QML file.
\note Existing files are replaced without warning.
\section1 Exporting from GIMP to QML
\image qml-export-gimp.png
\section2 Running the Export Script
The script has been tested to work on GIMP 2. You can download GIMP 2 from
\l{http://www.gimp.org/downloads/}{GIMP Downloads}.
......
......@@ -50,7 +50,10 @@
\row
\li \l{Using ClearCase}{ClearCase}
\li \l{http://www-01.ibm.com/software/awdtools/clearcase/}
\li
\li Disabled by default. To enable the plugin, select
\uicontrol Help > \uicontrol {About Plugins} >
\uicontrol {Version Control} > \uicontrol ClearCase, and then
restart \QC.
\row
\li \l{Using CVS}{CVS}
\li \l{http://www.nongnu.org/cvs/}
......
......@@ -32,10 +32,17 @@ import sys
import base64
import re
import time
import json
import inspect
import threading
try:
# That's only used in native combined debugging right now, so
# we do not need to hard fail in cases of partial python installation
# that will never use this.
import json
except:
pass
if sys.version_info[0] >= 3:
xrange = range
toInteger = int
......
......@@ -24,7 +24,6 @@
****************************************************************************/
import QtQuick 2.1
import QtQuick.Controls 1.0
Rectangle {
property string title
......
......@@ -79,7 +79,9 @@ SOURCES += $$PWD/clangcodemodelserverinterface.cpp \
$$PWD/pchmanagerclientproxy.cpp \
$$PWD/projectpartpch.cpp \
$$PWD/precompiledheadersupdatedmessage.cpp \
$$PWD/removepchprojectpartsmessage.cpp
$$PWD/removepchprojectpartsmessage.cpp \
$$PWD/sourcerangesforquerymessage.cpp \
$$PWD/requestsourcerangesforquerymessage.cpp
HEADERS += \
$$PWD/clangcodemodelserverinterface.h \
......@@ -159,5 +161,10 @@ HEADERS += \
$$PWD/removepchprojectpartsmessage.h \
$$PWD/clangcodemodelclientmessages.h \
$$PWD/clangcodemodelservermessages.h \
$$PWD/sourcerangesforquerymessage.h \
$$PWD/clangrefactoringmessages.h \
$$PWD/clangrefactoringclientmessages.h \
$$PWD/clangrefactoringservermessages.h \
$$PWD/requestsourcerangesforquerymessage.h
contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
......@@ -128,7 +128,9 @@ enum class MessageType : quint8 {
RequestSourceLocationsForRenamingMessage,
RequestSourceRangesAndDiagnosticsForQueryMessage,
RequestSourceRangesForQueryMessage,
SourceRangesAndDiagnosticsForQueryMessage,
SourceRangesForQueryMessage,
CancelMessage,
UpdatePchProjectPartsMessage,
......
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
****************************************************************************/
#pragma once
#include "sourcelocationsforrenamingmessage.h"
#include "sourcerangesanddiagnosticsforquerymessage.h"
#include "sourcerangesforquerymessage.h"
#include "cmbalivemessage.h"
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
****************************************************************************/
#pragma once
#include "clangrefactoringclientmessages.h"
#include "clangrefactoringservermessages.h"
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
****************************************************************************/
#pragma once
#include "cancelmessage.h"
#include "cmbendmessage.h"
#include "requestsourcelocationforrenamingmessage.h"
#include "requestsourcerangesanddiagnosticsforquerymessage.h"
#include "requestsourcerangesforquerymessage.h"
......@@ -34,19 +34,19 @@ class DynamicASTMatcherDiagnosticContainer
{
public:
DynamicASTMatcherDiagnosticContainer() = default;
DynamicASTMatcherDiagnosticContainer(std::vector<DynamicASTMatcherDiagnosticMessageContainer> &&messages,
std::vector<DynamicASTMatcherDiagnosticContextContainer> &&contexts)
DynamicASTMatcherDiagnosticContainer(DynamicASTMatcherDiagnosticMessageContainers &&messages,
DynamicASTMatcherDiagnosticContextContainers &&contexts)
: m_messages(std::move(messages)),
m_contexts(std::move(contexts))
{
}
const std::vector<DynamicASTMatcherDiagnosticMessageContainer> &messages() const
const DynamicASTMatcherDiagnosticMessageContainers &messages() const
{
return m_messages;
}
const std::vector<DynamicASTMatcherDiagnosticContextContainer> &contexts() const
const DynamicASTMatcherDiagnosticContextContainers &contexts() const
{
return m_contexts;
}
......@@ -88,15 +88,16 @@ public:
DynamicASTMatcherDiagnosticContainer clone() const
{
return DynamicASTMatcherDiagnosticContainer(Utils::clone(m_messages),
Utils::clone(m_contexts));
return *this;
}
private:
std::vector<DynamicASTMatcherDiagnosticMessageContainer> m_messages;
std::vector<DynamicASTMatcherDiagnosticContextContainer> m_contexts;
DynamicASTMatcherDiagnosticMessageContainers m_messages;
DynamicASTMatcherDiagnosticContextContainers m_contexts;
};
using DynamicASTMatcherDiagnosticContainers = std::vector<DynamicASTMatcherDiagnosticContainer>;
CMBIPC_EXPORT QDebug operator<<(QDebug debug, const DynamicASTMatcherDiagnosticContainer &container);
std::ostream &operator<<(std::ostream &os, const DynamicASTMatcherDiagnosticContainer &container);
......
......@@ -105,6 +105,8 @@ private:
Utils::SmallStringVector m_arguments;
};
using DynamicASTMatcherDiagnosticContextContainers = std::vector<DynamicASTMatcherDiagnosticContextContainer>;
CMBIPC_EXPORT QDebug operator<<(QDebug debug, const DynamicASTMatcherDiagnosticContextContainer &container);
std::ostream &operator<<(std::ostream &os, const DynamicASTMatcherDiagnosticContextContainer &container);
......
......@@ -105,6 +105,8 @@ private:
Utils::SmallStringVector m_arguments;
};
using DynamicASTMatcherDiagnosticMessageContainers = std::vector<DynamicASTMatcherDiagnosticMessageContainer>;