Remove uses of QT_POINTER_SIZE, replacing with proper constructs

Where the size of void* was really wanted, use sizeof(void*).

There's only one use of QT_POINTER_SIZE in qtdeclarative now, in fdegen/
main.cpp selecting the ELF size constants. It's easier to keep it like
that than to use C++ selecting constructs. The tool isn't built anyway.

Change-Id: I1d0f78915b5942aab07cffff140fa0f99ce7d7d4
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/tools/fdegen/main.cpp b/tools/fdegen/main.cpp
index 1fb7a5b076..1906037989 100644
--- a/tools/fdegen/main.cpp
+++ b/tools/fdegen/main.cpp
@@ -140,7 +140,7 @@ static int createSectionCallback(
 }
 
 static unsigned char cie_init_instructions[] = {
-    DW_CFA_def_cfa, StackPointerRegister, /*offset in bytes */QT_POINTER_SIZE,
+    DW_CFA_def_cfa, StackPointerRegister, /*offset in bytes */sizeof(void*),
     DW_CFA_offset | InstructionPointerRegister, 1,
 };
 
@@ -158,8 +158,8 @@ int main()
 
     Dwarf_Unsigned cie = dwarf_add_frame_cie(dw,
                                              "",
-                                             /* code alignment factor */QT_POINTER_SIZE,
-                                             /* data alignment factor */-QT_POINTER_SIZE,
+                                             /* code alignment factor */sizeof(void*),
+                                             /* data alignment factor */-sizeof(void*),
                                              /* return address reg*/InstructionPointerRegister,
                                              cie_init_instructions,
                                              sizeof(cie_init_instructions),
@@ -270,7 +270,7 @@ int main()
 
     printf("static const int fde_offset = %d;\n", fde_offset);
     printf("static const int initial_location_offset = %d;\n", fde_offset + 8);
-    printf("static const int address_range_offset = %d;\n", fde_offset + 8 + QT_POINTER_SIZE);
+    printf("static const int address_range_offset = %d;\n", fde_offset + 8 + sizeof(void*));
 
 #ifdef DEBUG
     {