summaryrefslogtreecommitdiffstats
path: root/src/kernel/qcursor.h
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2018-09-25 20:57:27 +0900
committerMichele Calgaro <[email protected]>2018-09-25 20:57:27 +0900
commit230ed5e400ea4276d927570a7781cfcb5c7a534a (patch)
tree56bb72cae9206a3a6734a380f48b85051d054614 /src/kernel/qcursor.h
parent2df70f03d493f5226821dd2e1da3759e3abceb02 (diff)
downloadqt3-230ed5e400ea4276d927570a7781cfcb5c7a534a.tar.gz
qt3-230ed5e400ea4276d927570a7781cfcb5c7a534a.zip
Always build with a clean namespace
QT_CLEAN_NAMESPACE constant is no more needed This may theoretically affect applications created for Qt1 and Qt2, but such applications require further modifications as well. --------------------------- Cherry picked and adapted from commit ff63338d in tqt3 from Slávek Banko <[email protected]> Signed-off-by: Michele Calgaro <[email protected]>
Diffstat (limited to 'src/kernel/qcursor.h')
-rw-r--r--src/kernel/qcursor.h13
1 files changed, 0 insertions, 13 deletions
diff --git a/src/kernel/qcursor.h b/src/kernel/qcursor.h
index 9b99edb..7518cd3 100644
--- a/src/kernel/qcursor.h
+++ b/src/kernel/qcursor.h
@@ -122,19 +122,6 @@ private:
};
-#if !defined(QT_CLEAN_NAMESPACE)
-// CursorShape is defined in X11/X.h
-#ifdef CursorShape
-#define X_CursorShape CursorShape
-#undef CursorShape
-#endif
-typedef Qt::CursorShape QCursorShape;
-#ifdef X_CursorShape
-#define CursorShape X_CursorShape
-#endif
-#endif
-
-
/*****************************************************************************
QCursor stream functions
*****************************************************************************/