Commit 99ba300a authored by Eike Ziller's avatar Eike Ziller

Merge remote-tracking branch 'origin/2.3'

Conflicts:
	qtcreator.pri
	src/libs/libs.pro
	src/plugins/debugger/watchwindow.cpp
	src/plugins/remotelinux/maemopackagecreationstep.h

Change-Id: Ic67c46256d0060ee9845b92ef82539f6f8fbe639
parents 01bb7443 d78d7dbc
......@@ -9475,6 +9475,13 @@
libraries on devices. Then select the device as the target before you
start debugging.
\section1 Mixed C++/QML Debugging
You can debug both the C++ and QML parts of your application at the same time:
Select the checkboxes for both languages in the \gui{Run Settings}. However,
C++ breakpoints will be ignored until the debugger has attached also to the QML
engine.
\section1 Starting QML Debugging
To start the application, choose \gui {Debug > Start Debugging
......
......@@ -32,7 +32,6 @@
import QtQuick 1.0
import "custom" as Components
import "plugin"
Item {
id: scrollbar
......
include(../../../qtcreator.pri)
TEMPLATE = app
TARGET = phony_target3
CONFIG -= qt separate_debug_info gdb_dwarf_index
QT =
LIBS =
macx:CONFIG -= app_bundle
isEmpty(vcproj) {
QMAKE_LINK = @: IGNORE THIS LINE
OBJECTS_DIR =
win32:CONFIG -= embed_manifest_exe
} else {
CONFIG += console
PHONY_DEPS = .
phony_src.input = PHONY_DEPS
phony_src.output = phony.c
phony_src.variable_out = GENERATED_SOURCES
phony_src.commands = echo int main() { return 0; } > phony.c
phony_src.name = CREATE phony.c
phony_src.CONFIG += combine
QMAKE_EXTRA_COMPILERS += phony_src
}
DATA_FILE_PATTERNS = \
$$PWD/*.qml \
$$PWD/qmldir \
$$PWD/images/* \
$$PWD/custom/* \
$$PWD/custom/behaviors/* \
$$PWD/custom/private/*
!isEmpty(copydata) {
for(data_file, DATA_FILE_PATTERNS) {
files = $$files($$data_file, false)
win32:files ~= s|\\\\|/|g
for(file, files):!exists($$file/*):FILES += $$file
}
OTHER_FILES += $$FILES
copy2build.input = FILES
copy2build.output = $$IDE_LIBRARY_PATH/qtcomponents/${QMAKE_FUNC_FILE_IN_stripSrcDir}
isEmpty(vcproj):copy2build.variable_out = PRE_TARGETDEPS
win32:copy2build.commands = $$QMAKE_COPY \"${QMAKE_FILE_IN}\" \"${QMAKE_FILE_OUT}\"
unix:copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
copy2build.name = COPY ${QMAKE_FILE_IN}
copy2build.CONFIG += no_link
QMAKE_EXTRA_COMPILERS += copy2build
}
!macx {
qmlfiles.files = $$PWD/*.qml $$PWD/qmldir $$PWD/images $$PWD/custom
qmlfiles.path = /lib/qtcreator/qtcomponents
INSTALLS += qmlfiles
}
......@@ -11,7 +11,7 @@ include(doc/doc.pri)
TEMPLATE = subdirs
CONFIG += ordered
SUBDIRS = src share
SUBDIRS = src share lib/qtcreator/qtcomponents
OTHER_FILES += dist/copyright_template.txt \
dist/changes-1.1.0 \
......
......@@ -561,8 +561,19 @@ def qdump__QLinkedList(d, item):
d.putSubItem(Item(p["t"], item.iname, i))
p = p["n"]
qqLocalesCount = None
def qdump__QLocale(d, item):
# Check for uninitialized 'index' variable. Retrieve size of QLocale data array
# from variable in qlocale.cpp (default: 368/Qt 4.8), 368 being 'System'.
global qqLocalesCount
if qqLocalesCount is None:
try:
qqLocalesCount = int(value(qtNamespace() + 'locale_data_size'))
except:
qqLocalesCount = 368
index = int(item.value["p"]["index"])
check(index >= 0 and index <= qqLocalesCount)
d.putStringValue(call(item.value, "name"))
d.putNumChild(0)
return
......
......@@ -435,8 +435,12 @@ void ObjectNodeInstance::setPropertyBinding(const QString &name, const QString &
if (oldBinding && !hasValidResetBinding(name))
oldBinding->destroy();
binding->update();
if (binding->hasError())
if (binding->hasError()) {
qDebug() <<" ObjectNodeInstance.setPropertyBinding has Error: " << object() << name << expression << binding->error().toString();
if (property.property().userType() == QVariant::String)
property.write(QVariant(QString("#%1#").arg(expression)));
}
} else {
qWarning() << "ObjectNodeInstance.setPropertyBinding: Cannot set binding for property" << name << ": property is unknown for type";
}
......
......@@ -69,41 +69,6 @@ QWidget {
}
}
QWidget { // 1
layout: HorizontalLayout {
Label {
text: qsTr("Source size")
}
DoubleSpinBox {
text: "W"
alignRight: false
spacing: 4
singleStep: 1;
enabled: anchorBackend.hasParent;
backendValue: backendValues.sourceSize_width
minimum: -2000;
maximum: 2000;
baseStateFlag: isBaseState;
}
DoubleSpinBox {
singleStep: 1;
text: "H"
alignRight: false
spacing: 4
backendValue: backendValues.sourceSize_height
enabled: anchorBackend.hasParent;
minimum: -2000;
maximum: 2000;
baseStateFlag: isBaseState;
}
}
} //QWidget //1
IntEditor {
id: pixelSize;
......
......@@ -85,21 +85,6 @@ QWidget {
}
}
QWidget {
layout: HorizontalLayout {
Label {
text: qsTr("Aliasing")
}
CheckBox {
text: qsTr("Smooth")
backendValue: backendValues.smooth
baseStateFlag: isBaseState;
checkable: true;
}
}
}
QWidget { // 1
layout: HorizontalLayout {
......@@ -135,41 +120,6 @@ QWidget {
}
} //QWidget //1
QWidget { // 1
layout: HorizontalLayout {
Label {
text: qsTr("Painted size")
}
DoubleSpinBox {
text: "W"
alignRight: false
spacing: 4
singleStep: 1;
enabled: anchorBackend.hasParent;
backendValue: backendValues.paintedWidth
minimum: -2000;
maximum: 2000;
baseStateFlag: isBaseState;
}
DoubleSpinBox {
singleStep: 1;
text: "H"
alignRight: false
spacing: 4
backendValue: backendValues.paintedHeight
enabled: anchorBackend.hasParent;
minimum: -2000;
maximum: 2000;
baseStateFlag: isBaseState;
}
}
} //QWidget //1
}
}
......
......@@ -48,6 +48,8 @@ GroupBox {
property variant colorAlpha: colorGroupBox.alpha
property bool hasGradient: backendValues.gradient.isInModel
property bool gradientIsBinding: backendValues.gradient.isBound
onHasGradientChanged: {
print("onGradientInModelChanged")
if (backendValues.gradient.isInModel) {
......@@ -75,7 +77,7 @@ GroupBox {
isSetup = true;
gradientLine.active = false;
colorGroupBox.setSolidButtonChecked = true;
if (backendValues.gradient.isInModel) {
if (backendValues.gradient.isInModel && !gradientIsBinding) {
colorGroupBox.setGradientButtonChecked = true;
gradientLine.active = true;
gradientLine.setupGradient();
......@@ -117,6 +119,8 @@ GroupBox {
}
ColorGroupBox {
enabled: !gradientIsBinding
opacity: gradientIsBinding ? 0.7 : 1
id: colorGroupBox
caption: qsTr("Rectangle")
finished: finishedNotify
......
......@@ -5,7 +5,6 @@
# may offer an updated version of it.
QT += declarative
CONFIG(debug, debug|release):CONFIG += declarative_debug
SOURCES += $$PWD/qmlapplicationviewer.cpp
HEADERS += $$PWD/qmlapplicationviewer.h
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -32,7 +32,7 @@
import QtQuick 1.0
import "widgets" as Widgets
import components 1.0 as Components
import qtcomponents 1.0 as Components
Item {
id: root
......
TEMPLATE = subdirs
SUBDIRS = components/styleitem
QML_IMPORT_PATH += $$OUT_PWD
OTHER_FILES = develop.qml \
gettingstarted.qml \
newssupport.qml \
welcomescreen.qml \
widgets/Button.qml \
widgets/CheckBox.qml \
widgets/Feedback.qml \
widgets/RatingBar.qml \
widgets/ExampleBrowser.qml \
widgets/LineEdit.qml \
widgets/ExampleDelegate.qml \
widgets/LinksBar.qml \
widgets/HeaderItemView.qml \
widgets/RecentSessions.qml \
widgets/RecentProjects.qml \
widgets/FeaturedAndNewsListing.qml \
widgets/NewsListing.qml \
widgets/TabWidget.qml \
widgets/TagBrowser.qml \
examples_fallback.xml \
qtcreator_tutorials.xml
......@@ -32,7 +32,7 @@
import QtQuick 1.0
import "widgets"
import components 1.0 as Components
import qtcomponents 1.0 as Components
Rectangle {
id: root
......
......@@ -31,7 +31,7 @@
**************************************************************************/
import Qt 4.7
import "../components/custom" as Custom
import qtcomponents.custom 1.0 as Custom
Custom.Button {
id: button
......
import QtQuick 1.0
import "../components/custom" as Custom
import qtcomponents.custom 1.0 as Custom
Custom.CheckBox{
id:checkbox
......
......@@ -31,8 +31,7 @@
**************************************************************************/
import QtQuick 1.0
import components 1.0 as Components
import widgets 1.0 as Widgets
import qtcomponents 1.0 as Components
Item {
id: exampleBrowserRoot
......@@ -57,7 +56,7 @@ Item {
anchors.leftMargin: - 8
anchors.rightMargin: scrollArea.verticalScrollBar.visible ? 0 : -8
Widgets.LineEdit {
LineEdit {
id: lineEdit
placeholderText: !checkBox.checked ? qsTr("Search in Tutorials") : qsTr("Search in Tutorials, Examples and Demos")
focus: true
......
......@@ -31,7 +31,7 @@
**************************************************************************/
import QtQuick 1.0
import components 1.0 as Components
import qtcomponents 1.0 as Components
Rectangle {
id: root
......
......@@ -31,7 +31,7 @@
**************************************************************************/
import QtQuick 1.0
import components 1.0 as Components
import qtcomponents 1.0 as Components
Item {
InsetText {
......
......@@ -31,7 +31,7 @@
**************************************************************************/
import QtQuick 1.0
import components 1.0 as Components
import qtcomponents 1.0 as Components
Rectangle {
id: inner_background
......
......@@ -31,7 +31,7 @@
**************************************************************************/
import QtQuick 1.0
import "../components/custom" as Custom
import qtcomponents.custom 1.0 as Custom
Custom.TextField {
......
......@@ -31,7 +31,7 @@
**************************************************************************/
import QtQuick 1.0
import components 1.0 as Components
import qtcomponents 1.0 as Components
Row {
id: tabBar
......
......@@ -31,7 +31,7 @@
**************************************************************************/
import QtQuick 1.1
import components 1.0 as Components
import qtcomponents 1.0 as Components
Item {
id: root
......
......@@ -31,7 +31,7 @@
**************************************************************************/
import QtQuick 1.1
import components 1.0 as Components
import qtcomponents 1.0 as Components
HeaderItemView {
header: qsTr("Recently Edited Projects")
......
......@@ -31,14 +31,14 @@
**************************************************************************/
import QtQuick 1.0
import components 1.0 as Components
import qtcomponents 1.0 as Components
HeaderItemView {
header: qsTr("Recently Used Sessions")
model: sessionList
delegate: Rectangle {
height: 60
height: 30
width: dataSection.width
Rectangle {
......
TEMPLATE = subdirs
SUBDIRS = qtcreator/static.pro \
qtcreator/translations \
qtcreator/welcomescreen
qtcreator/translations
......@@ -2771,6 +2771,21 @@ bool Bind::visit(ClassSpecifierAST *ast)
startScopeOffset = tokenAt(q->unqualified_name->lastToken() - 1).end(); // at the end of the unqualified name
}
}
// get the unqualified class name
const QualifiedNameId *q = className->asQualifiedNameId();
const Name *unqualifiedClassName = q ? q->name() : className;
if (! unqualifiedClassName) // paranoia check
className = 0;
else if (! (unqualifiedClassName->isNameId() || unqualifiedClassName->isTemplateNameId())) {
translationUnit()->error(sourceLocation, "expected a class-name");
className = unqualifiedClassName->identifier();
if (q && className)
className = control()->qualifiedNameId(q->base(), className);
}
}
Class *klass = control()->newClass(sourceLocation, className);
......
......@@ -15,7 +15,8 @@ SUBDIRS = \
qmljs \
qmljsdebugclient \
glsl \
qmleditorwidgets
qmleditorwidgets \
qtcomponents/styleitem
# Windows: Compile Qt Creator CDB extension if Debugging tools can be detected.
win32 {
......