Commit 9bbafdb5 authored by Eike Ziller's avatar Eike Ziller
Browse files

Merge remote-tracking branch 'origin/2.6'

Conflicts:
	share/share.qbs

Change-Id: I2ab6080a8cc5315191b33c6df21a835df888a291
parents ce911e04 c89ffbe3
......@@ -121,7 +121,7 @@ Component.prototype.createOperations = function()
"@TargetDir@\\bin\\qtcreator.exe",
"@StartMenuDir@/Qt Creator.lnk",
"workingDirectory=@homeDir@" );
component.addElevatedOperation("Execute", "{0,3010}", "@TargetDir@\\lib\\vcredist_msvc2010\\vcredist_x86.exe", "/norestart", "/q");
component.addElevatedOperation("Execute", "{0,3010,1638}", "@TargetDir@\\lib\\vcredist_msvc2010\\vcredist_x86.exe", "/norestart", "/q");
registerWindowsFileTypeExtensions();
}
if ( installer.value("os") == "x11" )
......
QT += core gui network
greaterThan(QT_MAJOR_VERSION, 4) {
QT += quick1 quick1-private core-private widgets-private gui-private script-private
} else {
QT += declarative
}
QT += core gui network declarative
greaterThan(QT_MAJOR_VERSION, 4): QT += declarative-private core-private widgets-private gui-private script-private
greaterThan(QT_MAJOR_VERSION, 4) {
} else {
......
......@@ -4,11 +4,7 @@
# It is recommended not to modify this file, since newer versions of Qt Creator
# may offer an updated version of it.
equals(QT_MAJOR_VERSION, 5) {
QT += quick1
} else {
QT += declarative
}
QT += declarative
SOURCES += $$PWD/qmlapplicationviewer.cpp
HEADERS += $$PWD/qmlapplicationviewer.h
......
......@@ -6,10 +6,7 @@ SOURCES += $$PWD/easinggraph.cpp \
HEADERS += $$PWD/easinggraph.h \
$$PWD/easingcontextpane.h
greaterThan(QT_MAJOR_VERSION, 4) {
QT += quick1
} else {
QT += declarative
}
QT += declarative
RESOURCES += $$PWD/easingpane.qrc
FORMS += $$PWD/easingcontextpane.ui
QT += script
greaterThan(QT_MAJOR_VERSION, 4) {
QT += quick1
} else {
QT += declarative
}
QT += script declarative
INCLUDEPATH += $$PWD
......
INCLUDEPATH *= $$PWD
INCLUDEPATH *= $$PWD/easingpane
greaterThan(QT_MAJOR_VERSION, 4) {
QT += quick1
} else {
QT += declarative
}
QT += declarative
LIBS *= -l$$qtLibraryName(QmlEditorWidgets)
......
......@@ -13,7 +13,7 @@ QtcLibrary {
cpp.optimization: "fast"
Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["widgets", "quick1", "script"] }
Depends { name: "Qt"; submodules: ["widgets", "declarative", "script"] }
Depends { name: "QmlJS" }
Depends { name: "Utils" }
......
TEMPLATE = lib
CONFIG += qt plugin
QT += script
greaterThan(QT_MAJOR_VERSION, 4) {
QT += widgets quick1
} else {
QT += declarative
}
QT += script declarative
TARGET = styleplugin
include(../../../../qtcreator.pri)
......
......@@ -6,7 +6,7 @@ DynamicLibrary {
destination: "lib/qtcreator/qtcomponents/plugin"
Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["core", "widgets", "quick1", "script"] }
Depends { name: "Qt"; submodules: ["core", "widgets", "declarative", "script"] }
cpp.defines: Defaults.defines(qbs)
......
......@@ -60,7 +60,7 @@ linux-* {
include(../../qtcreator.pri)
contains(QT_CONFIG, declarative)|contains(QT_CONFIG, quick1) {
contains(QT_CONFIG, declarative) {
SUBDIRS += \
plugin_qmlprojectmanager \
plugin_qmlprofiler
......@@ -78,7 +78,7 @@ contains(QT_CONFIG, declarative)|contains(QT_CONFIG, quick1) {
}
}
} else {
warning("QmlProjectManager, QmlProfiler and QmlDesigner plugins have been disabled: The plugins require QtDeclarative (Qt 4.x) or QtQuick1 (Qt 5.x)");
warning("QmlProjectManager, QmlProfiler and QmlDesigner plugins have been disabled: The plugins require QtDeclarative");
}
include (debugger/lldb/guest/qtcreator-lldb.pri)
......
TEMPLATE = lib
TARGET = ProjectExplorer
QT += xml script network
greaterThan(QT_MAJOR_VERSION, 4) {
QT += quick1
} else {
QT += declarative
}
QT += xml script network declarative
include(../../qtcreatorplugin.pri)
include(projectexplorer_dependencies.pri)
......
......@@ -6,7 +6,7 @@ import "../../../qbs/defaults.js" as Defaults
QtcPlugin {
name: "ProjectExplorer"
Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "script", "quick1"] }
Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "script", "declarative"] }
Depends { name: "Core" }
Depends { name: "Locator" }
Depends { name: "Find" }
......
......@@ -15,5 +15,5 @@ OTHER_FILES += \
qml/ItemsView.qml
greaterThan(QT_MAJOR_VERSION, 4) {
QT += quick1-private core-private script-private
QT += declarative-private core-private script-private
}
......@@ -39,11 +39,7 @@ HEADERS += propertyeditor.h \
declarativewidgetview.h \
gradientlineqmladaptor.h
greaterThan(QT_MAJOR_VERSION, 4) {
QT += quick1
} else {
QT += declarative
}
QT += declarative
RESOURCES += propertyeditor.qrc
FORMS += behaviordialog.ui
......@@ -7,7 +7,7 @@ QtcPlugin {
condition: qtcore.versionMajor == 4
Depends { id: qtcore; name: "Qt.core" }
Depends { name: "Qt"; submodules: ["widgets", "quick1"] }
Depends { name: "Qt"; submodules: ["widgets", "declarative"] }
Depends { name: "Core" }
Depends { name: "QmlJS" }
Depends { name: "QmlEditorWidgets" }
......
......@@ -3,12 +3,7 @@ TARGET = QmlProfiler
DEFINES += QMLPROFILER_LIBRARY
QT += network script
greaterThan(QT_MAJOR_VERSION, 4) {
QT += quick1
} else {
QT += declarative
}
QT += network script declarative
include(../../qtcreatorplugin.pri)
include(../../plugins/coreplugin/coreplugin.pri)
......
......@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "QmlProfiler"
Depends { name: "Qt"; submodules: ["widgets", "network", "script", "quick1"] }
Depends { name: "Qt"; submodules: ["widgets", "network", "script", "declarative"] }
Depends { name: "Core" }
Depends { name: "AnalyzerBase" }
Depends { name: "QmlProjectManager" }
......
TEMPLATE = lib
TARGET = QmlProjectManager
QT += network
greaterThan(QT_MAJOR_VERSION, 4) {
QT += quick1
} else {
QT += declarative
}
QT += network declarative
include(../../qtcreatorplugin.pri)
include(qmlprojectmanager_dependencies.pri)
......
......@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "QmlProjectManager"
Depends { name: "Qt"; submodules: ["widgets", "quick1"] }
Depends { name: "Qt"; submodules: ["widgets", "declarative"] }
Depends { name: "Core" }
Depends { name: "ProjectExplorer" }
Depends { name: "TextEditor" }
......
TEMPLATE = lib
TARGET = QtSupport
DEFINES += QT_CREATOR QTSUPPORT_LIBRARY
QT += network
greaterThan(QT_MAJOR_VERSION, 4) {
QT += quick1
} else {
QT += declarative
}
QT += network declarative
include(../../qtcreatorplugin.pri)
include(qtsupport_dependencies.pri)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment