From 2f2b78321427daa8c7f0702140c297d22b0bf3c8 Mon Sep 17 00:00:00 2001 From: Debao Zhang Date: Tue, 20 Mar 2012 20:21:30 -0700 Subject: Remove QWorkspace. QWorkspace had been called Q3Workspace before Qt4.0 finally released. In a sense, it is a Qt3 support Widget. And QWorkspace has been deprecated and replaced by QMdiArea at Qt4.3. Change-Id: Iea1bf831c9960c23c2b21d51fdc7c13b303642ea Reviewed-by: Friedemann Kleint Reviewed-by: Lars Knoll --- src/corelib/global/qconfig-large.h | 3 --- src/corelib/global/qconfig-medium.h | 3 --- src/corelib/global/qconfig-minimal.h | 3 --- src/corelib/global/qconfig-small.h | 3 --- src/corelib/global/qfeatures.h | 5 ----- src/corelib/global/qfeatures.txt | 7 ------- 6 files changed, 24 deletions(-) (limited to 'src/corelib') diff --git a/src/corelib/global/qconfig-large.h b/src/corelib/global/qconfig-large.h index 4d23999c2a..a3d241f8e6 100644 --- a/src/corelib/global/qconfig-large.h +++ b/src/corelib/global/qconfig-large.h @@ -159,9 +159,6 @@ #ifndef QT_NO_DATETIMEEDIT # define QT_NO_DATETIMEEDIT #endif -#ifndef QT_NO_WORKSPACE -# define QT_NO_WORKSPACE -#endif #ifndef QT_NO_DIAL # define QT_NO_DIAL #endif diff --git a/src/corelib/global/qconfig-medium.h b/src/corelib/global/qconfig-medium.h index 9ed73aa645..b52b067909 100644 --- a/src/corelib/global/qconfig-medium.h +++ b/src/corelib/global/qconfig-medium.h @@ -242,9 +242,6 @@ #ifndef QT_NO_MENUBAR # define QT_NO_MENUBAR #endif -#ifndef QT_NO_WORKSPACE -# define QT_NO_WORKSPACE -#endif #ifndef QT_NO_PROGRESSBAR # define QT_NO_PROGRESSBAR #endif diff --git a/src/corelib/global/qconfig-minimal.h b/src/corelib/global/qconfig-minimal.h index 24349a76ba..512b82c60f 100644 --- a/src/corelib/global/qconfig-minimal.h +++ b/src/corelib/global/qconfig-minimal.h @@ -494,9 +494,6 @@ #ifndef QT_NO_MENUBAR # define QT_NO_MENUBAR #endif -#ifndef QT_NO_WORKSPACE -# define QT_NO_WORKSPACE -#endif #ifndef QT_NO_PROGRESSBAR # define QT_NO_PROGRESSBAR #endif diff --git a/src/corelib/global/qconfig-small.h b/src/corelib/global/qconfig-small.h index e6cebfe110..9fca199964 100644 --- a/src/corelib/global/qconfig-small.h +++ b/src/corelib/global/qconfig-small.h @@ -282,9 +282,6 @@ #ifndef QT_NO_MENUBAR # define QT_NO_MENUBAR #endif -#ifndef QT_NO_WORKSPACE -# define QT_NO_WORKSPACE -#endif #ifndef QT_NO_PROGRESSBAR # define QT_NO_PROGRESSBAR #endif diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h index d9e030875f..de45437959 100644 --- a/src/corelib/global/qfeatures.h +++ b/src/corelib/global/qfeatures.h @@ -652,11 +652,6 @@ #define QT_NO_PRINTPREVIEWWIDGET #endif -// QWorkSpace -#if !defined(QT_NO_WORKSPACE) && (defined(QT_NO_SCROLLBAR) || defined(QT_NO_MAINWINDOW) || defined(QT_NO_MENUBAR)) -#define QT_NO_WORKSPACE -#endif - // QCalendarWidget #if !defined(QT_NO_CALENDARWIDGET) && (defined(QT_NO_TABLEVIEW) || defined(QT_NO_MENU) || defined(QT_NO_TEXTDATE) || defined(QT_NO_SPINBOX) || defined(QT_NO_TOOLBUTTON)) #define QT_NO_CALENDARWIDGET diff --git a/src/corelib/global/qfeatures.txt b/src/corelib/global/qfeatures.txt index 795529b933..56ad9a6fea 100644 --- a/src/corelib/global/qfeatures.txt +++ b/src/corelib/global/qfeatures.txt @@ -407,13 +407,6 @@ Requires: RUBBERBAND MAINWINDOW Name: QDockwidget SeeAlso: ??? -Feature: WORKSPACE -Description: Supports workspace windows, e.g. used in an MDI application. -Section: Widgets -Requires: SCROLLBAR MAINWINDOW MENUBAR -Name: QWorkSpace -SeeAlso: ??? - Feature: MDIAREA Description: Provides an area in which MDI windows are displayed. Section: Widgets -- cgit v1.2.3