Commit 1d1d2f0b authored by Friedemann Kleint's avatar Friedemann Kleint
Browse files

Compile with Qt 5.



- QtQuick1 renaming.
- Start on qtconcurrent split (pending renaming of Qt Creator's
  qtconcurrent library).
- QWinEventNotifier is a public class in Qt 5.
- Metatype system: Classes need to be known.

Change-Id: I5582e7cc2777bf791a08b049262217055769c80f
Reviewed-by: default avatarMiikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: default avatarFriedemann Kleint <Friedemann.Kleint@nokia.com>
parent cb1cddb8
......@@ -157,5 +157,5 @@ win32-msvc* {
qt:greaterThan(QT_MAJOR_VERSION, 4) {
contains(QT, gui): QT += widgets
contains(QT, declarative): QT += qtquick1
contains(QT, declarative): QT += quick1
}
......@@ -8,6 +8,8 @@ INCLUDEPATH += $$PWD
include(../3rdparty/cplusplus/cplusplus.pri)
greaterThan(QT_MAJOR_VERSION, 4): QT += concurrent
contains(QT, gui) {
HEADERS += \
$$PWD/Icons.h \
......
TEMPLATE = lib
CONFIG += qt plugin
QT += declarative
QT += script
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets qtquick1
greaterThan(QT_MAJOR_VERSION, 4) {
QT += widgets quick1
} else {
QT += declarative
}
TARGET = styleplugin
include(../../../../qtcreator.pri)
......
......@@ -4,6 +4,8 @@ DEFINES += BUILD_QTCONCURRENT
include(../../qtcreatorlibrary.pri)
greaterThan(QT_MAJOR_VERSION, 4): QT += concurrent
HEADERS += \
qtconcurrent_global.h \
multitask.h \
......
......@@ -41,9 +41,12 @@
#include <QtNetwork/QLocalServer>
#ifdef Q_OS_WIN
#include <QtCore/private/qwineventnotifier_p.h>
#include <windows.h>
# if QT_VERSION >= 0x050000
# include <QtCore/QWinEventNotifier>
# else
# include <QtCore/private/qwineventnotifier_p.h>
# endif
# include <windows.h>
#endif
namespace Utils {
......
......@@ -7,13 +7,12 @@ include(../../qtcreatorlibrary.pri)
include(utils_dependencies.pri)
include(utils-lib.pri)
# Needed for QtCore/private/qwineventnotifier_p.h
win32 {
greaterThan(QT_MAJOR_VERSION, 4) {
QT += core-private
} else {
include(../../private_headers.pri)
}
greaterThan(QT_MAJOR_VERSION, 4) {
QT += concurrent
} else {
# Needed for QtCore/private/qwineventnotifier_p.h
win32:include(../../private_headers.pri)
}
HEADERS += \
......
......@@ -31,6 +31,7 @@
**************************************************************************/
#include "commandmappings.h"
#include "shortcutsettings.h"
#include "ui_commandmappings.h"
#include "actionmanager_p.h"
#include "actionmanager/command.h"
......
......@@ -4,7 +4,7 @@ DEFINES += CORE_LIBRARY
QT += network \
script \
sql
greaterThan(QT_MAJOR_VERSION, 4): QT += printsupport
greaterThan(QT_MAJOR_VERSION, 4): QT += printsupport concurrent
CONFIG += help
include(../../qtcreatorplugin.pri)
......
......@@ -2,6 +2,7 @@ TEMPLATE = lib
TARGET = Locator
DEFINES += LOCATOR_LIBRARY
include(../../qtcreatorplugin.pri)
greaterThan(QT_MAJOR_VERSION, 4): QT += concurrent
include(locator_dependencies.pri)
HEADERS += locatorplugin.h \
commandlocator.h \
......
TARGET = UpdateInfo
TEMPLATE = lib
QT += network xml
greaterThan(QT_MAJOR_VERSION, 4): QT += concurrent
HEADERS += updateinfoplugin.h \
updateinfobutton.h
......
......@@ -32,7 +32,11 @@
#include "virtualserialdevice.h"
#include <windows.h>
#include <QtCore/private/qwineventnotifier_p.h>
#if QT_VERSION >= 0x050000
# include <QtCore/QWinEventNotifier>
#else
# include <QtCore/private/qwineventnotifier_p.h>
#endif
#include <QtCore/QThread>
#include <QtCore/QWaitCondition>
......
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